Autogenerated HTML docs for v1.5.5.1-248-g4b17
diff --git a/git-config.html b/git-config.html index a6db05d..31c1300 100644 --- a/git-config.html +++ b/git-config.html
@@ -2032,6 +2032,16 @@ </p> </dd> <dt> +merge.renameLimit +</dt> +<dd> +<p> + The number of files to consider when performing rename detection + during a merge; if not specified, defaults to the value of + diff.renameLimit. +</p> +</dd> +<dt> merge.tool </dt> <dd> @@ -2551,7 +2561,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 12-May-2008 00:29:20 UTC +Last updated 14-May-2008 22:24:40 UTC </div> </div> </body>
